Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

nixos/espanso: fix wayland option #317457

Merged
merged 1 commit into from
Jul 3, 2024
Merged

nixos/espanso: fix wayland option #317457

merged 1 commit into from
Jul 3, 2024
+1 −0

Conversation

rawkode
Copy link
Member

@rawkode rawkode commented Jun 5, 2024 •
edited
Loading

Description of changes

The espanso module recently added a wayland option which appears to be missing from the config.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` labels Jun 5, 2024
@rawkode rawkode changed the title fix: wayland option nixos/espanso: fix wayland option Jun 5, 2024
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 labels Jun 5, 2024
jtbx
jtbx suggested changes Jun 6, 2024
View reviewed changes
Copy link
Member

@jtbx jtbx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this supposed to do? If it's setting the package option, one can already do that manually. In any case it just looks like it's adding an option without any logic. :)

nixos/modules/services/desktops/espanso.nix Outdated Show resolved Hide resolved
jtbx
jtbx approved these changes Jun 6, 2024
View reviewed changes
Copy link
Member

@jtbx jtbx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah I didn't see that down below, thanks.

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Jun 7, 2024
@rawkode
Copy link
Member Author

rawkode commented Jul 3, 2024

@jtbx @Aleksanaa Can we merge?

@Aleksanaa
Copy link
Member

Also please squash your commits into nixos/espanso: fix wayland option

@rawkode
Copy link
Member Author

rawkode commented Jul 3, 2024

@Aleksanaa Done

@Aleksanaa
Copy link
Member

Please squash your commits into nixos/espanso: fix wayland option.

@rawkode @Aleksanaa
nixos/espanso: fix wayland option
f13e08a 
Co-authored-by: Aleksana <alexander.huang.y@gmail.com>
@rawkode
Copy link
Member Author

rawkode commented Jul 3, 2024

Sorry, I missed read your message. This has been resolved.

@Aleksanaa Aleksanaa merged commit 3a96597 into NixOS:master Jul 3, 2024
8 of 10 checks passed
@pitkling
Copy link
Member

Was there a race condition between this PR and commit 7f447ce (by @michaelBelsanti)? The latter removed the mkIf that was referencing the (at the time of the commit non-existent) wayland option. Shortly after, this PR introduced the option, which now is not used at all in the current master branch.

@pitkling
Copy link
Member

Just for completeness: The PR for the commit mentioned above seems to be PR #316519. Also pinging @n8henrie and @SuperSandro2000 who were involved in that PR.

@n8henrie
Copy link
Contributor

I thought we had determined not to use a separate wayland option since the idiomatic approach is just to allow one to set package.

Sorry about missing this, I meant to add myself to espanso maintainers at some point.

@n8henrie
Copy link
Contributor

I'll take a closer look later today, currently on mobile.

@n8henrie
Copy link
Contributor

@Aleksanaa @rawkode @pitkling Here was the review where @SuperSandro2000 had recommended to just use the package option (without a separate wayland option), and we had worked towards removing it. Was there a reason to go back the other direction with this?

Should we have just removed the wayland option (and all references to it), since it is already configured to use the package option?

@rawkode
Copy link
Member Author

rawkode commented Jul 17, 2024

I was just trying to fix the broken package. If the Wayland option has been removed, we can continue that way. I assume this was some merge race condition

@pitkling pitkling mentioned this pull request Jul 21, 2024
Open
13 tasks
n8henrie added a commit to n8henrie/nixpkgs that referenced this pull request Sep 4, 2024
@n8henrie
nixos/espanso: remove unused wayland option
526239b 
This option is unused in the module.

As discussed in NixOS#317457 and
NixOS#285138 (comment)
users should just set the `package` option.
This was referenced Sep 4, 2024
Closed
Merged
@pitkling pitkling mentioned this pull request Sep 21, 2024
Open
nix-backports bot pushed a commit that referenced this pull request Dec 4, 2024
@n8henrie @github-actions
nixos/espanso: remove unused wayland option
59211dc 
This option is unused in the module.

As discussed in #317457 and
#285138 (comment)
users should just set the `package` option.

(cherry picked from commit 526239b)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Aleksanaa Aleksanaa Aleksanaa left review comments

@jtbx jtbx jtbx approved these changes

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: module (update) This PR changes an existing module in `nixos/` 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@rawkode @Aleksanaa @pitkling @n8henrie @jtbx @wegank